From: Julien Grall Date: Tue, 28 Jun 2016 15:51:54 +0000 (+0100) Subject: xen/arm: gic-v3: No need to sort the Redistributor regions X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~810 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fdf1c6140420df20ffcdca9a0d7cdd7369fde03a;p=xen.git xen/arm: gic-v3: No need to sort the Redistributor regions The sorting was required by the vGIC emulation until commit 9b9d51e98edb8c5c731e2d06dfad3633053d88a4 "xen/arm: vgic-v3: Correctly retrieve the vCPU associated to a re-distributor". Furthermore, the code is buggy because both local variables 'l' and 'r' point to the same region. So drop the code which sort the Redistributors array. Reported-by: Shanker Donthineni Signed-off-by: Julien Grall Acked-by: Stefano Stabellini --- diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index dfc62e87e5..b8a4bde6e2 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -1134,14 +1134,6 @@ static const hw_irq_controller gicv3_guest_irq_type = { .set_affinity = gicv3_irq_set_affinity, }; -static int __init cmp_rdist(const void *a, const void *b) -{ - const struct rdist_region *l = a, *r = a; - - /* We assume that re-distributor regions can never overlap */ - return ( l->base < r->base) ? -1 : 0; -} - static paddr_t __initdata dbase = INVALID_PADDR; static paddr_t __initdata vbase = INVALID_PADDR, vsize = 0; static paddr_t __initdata cbase = INVALID_PADDR, csize = 0; @@ -1210,9 +1202,6 @@ static void __init gicv3_dt_init(void) rdist_regs[i].size = rdist_size; } - /* The vGIC code requires the region to be sorted */ - sort(rdist_regs, gicv3.rdist_count, sizeof(*rdist_regs), cmp_rdist, NULL); - if ( !dt_property_read_u32(node, "redistributor-stride", &gicv3.rdist_stride) ) gicv3.rdist_stride = 0; @@ -1455,9 +1444,6 @@ static void __init gicv3_acpi_init(void) rdist_regs[i].size = gic_rdist->length; } - /* The vGIC code requires the region to be sorted */ - sort(rdist_regs, gicv3.rdist_count, sizeof(*rdist_regs), cmp_rdist, NULL); - gicv3.rdist_regions= rdist_regs; /* Collect CPU base addresses */